Merge "Send a cookie with autoblocks to prevent vandalism."

diff --combined includes/DefaultSettings.php
index 9a116ec,ca32a63..687ce9d
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -5864,7 -5864,7 +5864,7 @@@ $wgProxyList = []
  /**
   * Default cookie lifetime, in seconds. Setting to 0 makes all cookies session-only.
   */
 -$wgCookieExpiration = 180 * 86400;
 +$wgCookieExpiration = 30 * 86400;
  
  /**
   * Default login cookie lifetime, in seconds. Setting
@@@ -5872,7 -5872,7 +5872,7 @@@
   * calculate the cookie lifetime. As with $wgCookieExpiration, 0 will make
   * login cookies session-only.
   */
 -$wgExtendedLoginCookieExpiration = null;
 +$wgExtendedLoginCookieExpiration = 180 * 86400;
  
  /**
   * Set to set an explicit domain on the login cookies eg, "justthis.domain.org"
@@@ -5926,6 -5926,12 +5926,12 @@@ $wgCacheVaryCookies = []
   */
  $wgSessionName = false;
  
+ /**
+  * Whether to set a cookie when a user is autoblocked. Doing so means that a blocked user, even
+  * after logging out and moving to a new IP address, will still be blocked.
+  */
+ $wgCookieSetOnAutoblock = false;
+ 
  /** @} */ # end of cookie settings }
  
  /************************************************************************//**